intercept and mock e2e swaps calls #1754

greg-schrammel · 2024-11-01T16:29:10Z

Fixes APP-1868

This PR sets up mocking for swaps.

Changes:

Gregs wrote a script (mockFetch.ts) to intercept calls to our swaps endpoint and then return hashed responses stored in e2e/mocks/swap_quotes.
Anvil is set to be pinned to the block the quotes are originally from: 20923142
All of these are depending on the mockFetch being setup in the swaps root src/entries/popup/index.ts

greg-schrammel · 2024-11-01T16:31:01Z

e2e/mockFetch.ts

+
+    const url = new URL(input);
+
+    if (url.hostname === 'swap.p.rainbow.me') {


intercepts requests to swap.p.rainbow.me and responds with our mocked responses

socket-security · 2024-11-13T18:56:48Z

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report↗︎

socket-security · 2024-11-14T22:44:14Z

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/[email protected]	None	`+1`	5.18 MB	awkweb, jmoxey
npm/[email protected]	None	`0`	195 kB	jmoxey

🚮 Removed packages: npm/[email protected]

View full report↗︎

e2e/serial/send/2_shortcuts-sendFlow.test.ts

BrodyHughes · 2024-11-21T19:45:24Z

e2e/serial/send/2_shortcuts-sendFlow.test.ts

@@ -35,7 +36,6 @@ let driver: WebDriver;

 const browser = process.env.BROWSER || 'chrome';
 const os = process.env.OS || 'mac';
-const isFirefox = browser === 'firefox';


we no longer run FF tests

e2e/serial/swap/2_swapFlow2.test.ts

BrodyHughes · 2024-11-21T19:47:19Z

package.json

@@ -53,7 +56,7 @@
    "// Build and zip": "",
    "bundle": "yarn build && yarn zip",
    "// Runs tests": "",
-    "anvil": "ETH_MAINNET_RPC=$(grep ETH_MAINNET_RPC .env | cut -d '=' -f2) && anvil --fork-url $ETH_MAINNET_RPC",
+    "anvil": "ETH_MAINNET_RPC=$(grep ETH_MAINNET_RPC .env | cut -d '=' -f2) && anvil --fork-url $ETH_MAINNET_RPC --fork-block-number 21065950",


forked to block number from quotes

package.json

scripts/unit-tests.sh

src/core/raps/actions/crosschainSwap.test.ts

BrodyHughes

Biased approve

e2e/fetchResponses.ts

brunobar79

Overall looks good. I do have once concern that I'd live to see resolved or at least to have a plan before we decide to merge this.

Once this lands we're making all the tests 100% depending on hardhat chain id.
This takes away from the next goal which is to be able to run swaps e2e on l2.

Ideally hardhat should have the same chain id as the chain that is being forked, which makes everything else easier: not having to change test ids, not having to touch unit tests and keeping the ground work for supporting multichain mocked e2e in the future.

Can we try to do that?

linear · 2024-12-04T23:05:23Z

APP-1868 App Test should use mocked backend for swap tests

Added back the chainIds to the testIds, and also removed the reliance on chainId `1337` (hardhat) from unit tests. this was a step back to the larger goal of e2e L2 support

BrodyHughes · 2024-12-12T18:10:29Z

e2e/fetchResponses.ts

@@ -0,0 +1,66 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
+// this file is ran locally with ts-node to fetch the responses from the swap quotes urls


Ran locally to get swap_quotes outputs

BrodyHughes · 2024-12-12T18:10:50Z

e2e/mocks/mock_swap_quotes_urls.json

@@ -0,0 +1,169 @@
+[
+  "https://swap.p.rainbow.me/v1/quote?bridgeVersion=4&buyToken=0xff970a61a04b1ca14834a43f5de4533ebddb5cc8&chainId=1&currency=USD&fromAddress=0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc&refuel=false&sellAmount=1000000000000000000&sellToken=0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE&slippage=5&toChainId=42161",


these are all the requests we send out during e2e

BrodyHughes · 2024-12-12T18:12:32Z

src/core/raps/actions/unlock.ts

@@ -38,7 +38,7 @@ export const getAssetRawAllowance = async ({
  chainId: ChainId;
 }) => {
  try {
-    const provider = await getProvider({ chainId });
+    const provider = getProvider({ chainId });


unnecessary await

BrodyHughes · 2024-12-12T18:13:15Z

src/entries/popup/index.ts

@@ -13,6 +13,9 @@ require('../../core/utils/lockdown');
 initThemingLocal();
 syncStores();

+if (process.env.IS_TESTING === 'true')


this is where we set up the mock fetch to intercept requests

greg-schrammel added 2 commits October 31, 2024 20:01

prevent useSwapSlippage from making unnecessary requests

db0810f

test

9164172

greg-schrammel commented Nov 1, 2024

View reviewed changes

greg-schrammel added 2 commits November 4, 2024 12:22

response

1cd7b09

popular in rainbow

2119c2d

DanielSinclair requested review from BrodyHughes and brunobar79 November 5, 2024 04:06

greg-schrammel and others added 2 commits November 12, 2024 19:46

dad can you come pick me up im scared

a5e1c8f

Merge branch 'master' into greg-mock-swap-e2e

8624638

BrodyHughes added 4 commits November 13, 2024 12:58

yarn setup ran lol

1752d7f

hmm

5efb232

fix test 1, test test 2

becb035

logging

06942ad

BrodyHughes added 8 commits November 19, 2024 12:14

skip test

52efb0b

okay

37d9f68

audit fix

5675d1a

yarn install

74e8084

fix send

e9d33be

reenable retries

1c3e162

add all mocks, fix unit tests by making them use hardhat now

37d7bfc

rm retry:0

64d38ff

BrodyHughes reviewed Nov 21, 2024

View reviewed changes

clean up

4030edf

BrodyHughes requested a review from derHowie November 21, 2024 20:03

BrodyHughes approved these changes Nov 21, 2024

View reviewed changes

BrodyHughes changed the title ~~Greg mock swap e2e test~~ intercept and mock e2e swaps calls Nov 21, 2024

BrodyHughes mentioned this pull request Nov 22, 2024

Brody/mocking setup #1726

Closed

check vlock number add new hashed responses

235db69

greg-schrammel commented Dec 3, 2024

View reviewed changes

e2e/fetchResponses.ts Outdated Show resolved Hide resolved

BrodyHughes added 3 commits December 3, 2024 14:41

Merge branch 'master' into greg-mock-swap-e2e

0de1dfa

tweak script and get new responses + yarn install

25d7ebd

okay point the script at the anvil instance instead of our prod key

924befc

brunobar79 reviewed Dec 4, 2024

View reviewed changes

BrodyHughes added 3 commits December 12, 2024 10:36

undo the removal of chainIds from testIds (#1779)

aff68a2

Added back the chainIds to the testIds, and also removed the reliance on chainId `1337` (hardhat) from unit tests. this was a step back to the larger goal of e2e L2 support

Merge branch 'master' into greg-mock-swap-e2e

c3a70cc

bad merge oops

6995691

BrodyHughes reviewed Dec 12, 2024

View reviewed changes

BrodyHughes added 2 commits December 12, 2024 14:13

Merge branch 'master' into greg-mock-swap-e2e

d988f48

failOnError: false

60196a9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

intercept and mock e2e swaps calls #1754

intercept and mock e2e swaps calls #1754

greg-schrammel commented Nov 1, 2024 •

edited by BrodyHughes

Loading

greg-schrammel Nov 1, 2024

socket-security bot commented Nov 13, 2024 •

edited

Loading

socket-security bot commented Nov 14, 2024 •

edited

Loading

BrodyHughes Nov 21, 2024

BrodyHughes Nov 21, 2024

BrodyHughes left a comment

brunobar79 left a comment

linear bot commented Dec 4, 2024

BrodyHughes Dec 12, 2024

BrodyHughes Dec 12, 2024

BrodyHughes Dec 12, 2024

BrodyHughes Dec 12, 2024


		const url = new URL(input);

		if (url.hostname === 'swap.p.rainbow.me') {

		@@ -0,0 +1,66 @@
		/* eslint-disable @typescript-eslint/no-var-requires */

		// this file is ran locally with ts-node to fetch the responses from the swap quotes urls

		@@ -0,0 +1,169 @@
		[
		"https://swap.p.rainbow.me/v1/quote?bridgeVersion=4&buyToken=0xff970a61a04b1ca14834a43f5de4533ebddb5cc8&chainId=1&currency=USD&fromAddress=0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc&refuel=false&sellAmount=1000000000000000000&sellToken=0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE&slippage=5&toChainId=42161",

intercept and mock e2e swaps calls #1754

Are you sure you want to change the base?

intercept and mock e2e swaps calls #1754

Conversation

greg-schrammel commented Nov 1, 2024 • edited by BrodyHughes Loading

Fixes APP-1868

greg-schrammel Nov 1, 2024

Choose a reason for hiding this comment

socket-security bot commented Nov 13, 2024 • edited Loading

socket-security bot commented Nov 14, 2024 • edited Loading

BrodyHughes Nov 21, 2024

Choose a reason for hiding this comment

BrodyHughes Nov 21, 2024

Choose a reason for hiding this comment

BrodyHughes left a comment

Choose a reason for hiding this comment

brunobar79 left a comment

Choose a reason for hiding this comment

linear bot commented Dec 4, 2024

BrodyHughes Dec 12, 2024

Choose a reason for hiding this comment

BrodyHughes Dec 12, 2024

Choose a reason for hiding this comment

BrodyHughes Dec 12, 2024

Choose a reason for hiding this comment

BrodyHughes Dec 12, 2024

Choose a reason for hiding this comment

greg-schrammel commented Nov 1, 2024 •

edited by BrodyHughes

Loading

socket-security bot commented Nov 13, 2024 •

edited

Loading

socket-security bot commented Nov 14, 2024 •

edited

Loading